Merge "Add missing comment from my previous merge in 47966ce." into stage-aosp-master
am: 55f0ecb7c7

Change-Id: I8d46aa5e2b38de80ef0cd0d8028c8b2d13809b15