Merge "first stage mount: removing the restriction of mount points" am: 5218d69817 am: 7d491a0a7b
am: 7f6df5ddf9

Change-Id: I173bcf7f3989c38d4bf2b08d5cae627b5f47ffc4