Merge changes from topic "fstab-options"
am: 2982299b90

Change-Id: I580505f44e61ff7f952c1cd7c548a3a995333f72