Exempt-From-Owners-Approval: merge from master BUG 153071808 am: 74fcebb6b0

Change-Id: I826562c9b546f18b53382fd0e82b4f6b662555d9