Merge 4a3ed701caf35eeeaacd1b1c23e0572b02cc6b1d on remote branch

Change-Id: Ia849922ef2c60f0f3862ad81af97cbf96ed9e247