Merge acd48017ca2aaad4c675cee456b375ed87507007 on remote branch

Change-Id: I1db50a5bfb2729eae0687c98128c8f05d9481be5