Merge changes from topic "fscrypt-key-mgmt-improvements"
am: 736557c510

Change-Id: I94242353fb404e2979cf6e90e778d3d00f0a2653