keep mmc changes for 1st gen seperate

Change-Id: I0598b5607146d2575947a6ea7e2ffc05a528d088
allow more time for mmc to cleanup before shutdown

Change-Id: Iceed76334b2e67cecd958146afcc881dd18310ae