Merge "first stage mount: removing the restriction of mount points" into oc-dr1-dev
am: 998e3b28ba  -s ours

Change-Id: I28c377951f5f7ff661fe1fff3228543ac2ae7cfc