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