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

Change-Id: I7f2324753078ea9f6c7fb63faebcf51922c464f6