Merge "Add missing comment from my previous merge in 47966cec." into stage-aosp-master am: 55f0ecb7 am: 05928953 am: d015ea75
am: f905deb0

Change-Id: I44cfd7d0933e581aa5ad1e5f85c63376855b3abc