Merge "Add emmc_optimized flag" am: 8279e6342e am: af0eeb0abb

Change-Id: Iabb7e0a526cbaba9a2700f2dfc75fc46816ce620