Exempt-From-Owners-Approval: merge from master BUG 153071808

Change-Id: I3bcbe4d27ac28ecbcd9c12ff45009922692bf404