Merge e2340b3eccad3462b6f31c4476d572d71e36a840 on remote branch

Change-Id: I10af52759c2a38803b468681243814206adcefa5