Merge 446cad5cbf71be9f96ffc6156be20c9746b62e28 on remote branch

Change-Id: Idd5d08b344171d014e69bab1706e6c807ed73f0c