restore emma changes overwrittern by I9174f843

Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
1 file changed