Merge aae2ba65ed9d617e54b3380f1814639fa084d356 on remote branch

Change-Id: I6de77a011c0311164d9a4a98ea749607f1fac901