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

Change-Id: Ib3ee5ebfacfc93851918a18475fa0303461a7ed8