Merge 0f893c2254af1011126b4bc660724b2ba339167b on remote branch

Change-Id: I1e8424fd8f921375f66677b599a4a67d818df775