Merge 931c15474356b1015e4ae80d109c034dc40c1d36 on remote branch

Change-Id: I413af70066c8da9be31a44719aa1cb50bca6f744