Merge "Fix race condition when entering low persistence mode" into oc-mr1-dev am: d947ff602e
am: e4159f4b0d

Change-Id: Id461281068fa437e96bbb0d1b3ab606a38f84b62