Merge 161b6608f8eb73b349ff4aeacdefd7ec22388a9b on remote branch

Change-Id: Ifa5d67a56e0d789047596973377a21b72ebb4a87