Merge changes from topic 'trusty_km2_hal'
am: a4b40020ef

Change-Id: I31e2ef8b8a41876cc6c2288abde798e261d00247