Merge changes from topics "fscrypt-options", "fstab-options" am: c17827b095 am: 18b8ad91b8 am: 2615e01740
am: f3a6282a63

Change-Id: Ibe2bb80d501c619881cc66c6b49cfcaf69a75ce2