Merge commit 'b4d54d3a0dc4b3ba7b606ef273751e98061edb6b' into HEAD

Change-Id: I5c6f22bbaad85786fec8da4eac806c652c593883