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

Change-Id: I821158f29b35e960e8c73c4ca3d14ab3b9c1db66