Merge 16f98a28c7a833c65268dfe6ea1bf10df54ae0eb on remote branch

Change-Id: Ia1aa568432614d6b9bc47b0ce3d8b00b42ca3a35