Merge commit 'b28c62a5130519d82a7152dcd2e30f7b406b5f60' into HEAD

Change-Id: I4a56ee9561b3c23121b34cb12f920330f6a5a5a3