resolved conflicts for merge of 5f2c8870 to master Change-Id: Ifbfe43c3dc859c36dd6e6c4cdb0de228acec29b8 GitOrigin-RevId: 07aaca2fc98cbf895fc72a84737bf67f290ede0f