Merge b355b5826d0314d322da74f3279a38b05579c1f9 on remote branch

Change-Id: Ibb1acbdbebbaf344597bdbc65a017674e3111864