Merge "emmc_optimized means stable_inodes" am: eb3be2e28f am: 04c09d39cf

Change-Id: Ibe6ce706d256424eb3aae260c6ce7c38da124450