Merge 3668a2392b36783038465a7955b6fa505e48df74 on remote branch

Change-Id: Ibcd02dfbf347046d4c7fd50310e5245a5a28b706