Merge 1a0319f7764457a9ef647357ea5cbd18d77da4b7 on remote branch

Change-Id: Ie60fff0c30168bd86ed3472795f23d8008381888