Merge changes from topic 'fstab_relocation'
am: ac13718d0a

Change-Id: Id94e7c5cc454f5b7d9c7b410d3358eaaa8768a97