Merge "fstab: allow mounting other slot" am: 9a7a50aea0 am: 4e32cb9f7a
am: f7f7dea35c

Change-Id: I72ecc126d23236ae4f0d6b763697f680cfb9b3d2