Merge "fs_mgr: Add stable_inodes flag to encrypted ext4" am: 7df60cee92 am: 955d6cbe2a
am: 271e0df140

Change-Id: I6f0a2921a6cc920776abd1a1a69cfdcb4d236daf