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

Change-Id: If46b58323883dcdeef72f0a394f79becca134c23