Sync with enterprise This restores parity with enterprise Change-Id: Ia3b134b7ed75b9182725e5d739e30cb31399bb0d