Merge 59367d73d59b018c0c5df1ed0a887f9557a00236 on remote branch

Change-Id: I4032804f7c97a2c88f501561c48a4ede04bf2bb5