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

Change-Id: Ib6470c085ac5fe023bdbf45523a8c548e202f318