Merge 1d7ba6435728fbe48a6cf8c870f96e30d7462aef on remote branch

Change-Id: I39d104773772209db5a6de6f0265d34c82141ddd