Merge "Save overlay paths as user state" into oc-dev
am: 508a5bade6

Change-Id: Icba76fbeef9f4cd2a067fafd65c750f1f95a4ed0