Merge "[automerger skipped] Merge "emmc_optimized means stable_inodes" into rvc-dev am: c05e7c0236 am: 9d0ade6dd8 am: 52ea5e96b5 -s ours" into rvc-qpr-dev-plus-aosp am: a1011a1002 -s ours

am skip reason: Change-Id Id7f906564457c240ddf6677dd536698881385385 with SHA-1 e96d6a9067 is in history

Change-Id: Iaf4228870185c1cd4d5437ca38aeafc2d7d97094