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

Change-Id: I8b2664197f51ecf3379e0de0e4303c71f0e2302b