Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev am: cbd1f32fdb
am: 5cff1f9e2f

Change-Id: Ibdd8747e88baad873145ff467fc2e22b66362cc9