Merge changes from topic 'ext4_encryption_flag' am: 7ce805c97e am: 4e02dcd7d0
am: 6af1b87cbc

Change-Id: I4eaa7306a01fc156ee133f379c609d95a96bb3a3