Merge 8596843547a21063123d74b213468a40159db7a1 on remote branch

Change-Id: I7283149f3dad2089e66f32b402bac08e02c2973a