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