Merge bb5d34868643fb29a85d4ccc3f54f250f9669271 on remote branch

Change-Id: Ia8363edf1574dce6d4dc76730c6b6b198ef4e946