Merge ef19d18b04b145a59d2283f24b1c4ebbd6a950d3 on remote branch

Change-Id: I35d8854e7c935e61982406bb6fc6237f520df093