Merge "Add emmc_optimized flag" am: 8279e6342e

Change-Id: I891ce0e76f7c70e4a967cb0e730289be4fbeceb3