Merge changes from topic 'fstab_relocation' am: ac13718d0a
am: 8f7125fbee

Change-Id: Ic350345536d3d6faf63c1e75a205b56a934a3657