Merge "Address comment for aog/502433"
am: 1863dd6179

Change-Id: Ied8e3964a3ea929d77090027d662e6219458a815