Merge "fstab: allow mounting other slot"
am: 9a7a50aea0

Change-Id: I12d176c3e34adac09ea05f46730caabece076421