Merge 05ecf415a7a6a4de746fc819a513111103c3103b on remote branch

Change-Id: I61e1f26b874247a178cdaf049f57255f538a8996