Merge bbc8aae83edca079a3fc3d54c909d338e1a2e311 on remote branch

Change-Id: Ief5878ccf7cc35b8b6cac190a1146a1eb0850ef6