Merge 2df7e3e7800886c199a4f5366c5b923eab47a19e on remote branch

Change-Id: Ibfa2de478d0518e284ebdb267d301f0fd7428200