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

Change-Id: Ic1e283752dd13c30ee79e6f95600e38580eec23d