Merge ef19d18b04b145a59d2283f24b1c4ebbd6a950d3 on remote branch

Change-Id: I5d995f047e59c35a503edd92f1d4adcd417e77e3