Merge 5b4fcd69e34cdf491fa596761abcda1333e2d75c on remote branch

Change-Id: I439b8bd0c5dd1f8937cff630b2dae32d25483fe1