Merge baa7dde0f8f57ec33b7a3f6119898297325155da on remote branch

Change-Id: I81e736873cd786f0a9bd922febdaf5e9716bd6b8