Merge changes from topic 'trusty_km2_hal' am: a4b40020ef
am: e53621c1f2

Change-Id: Ibb4104109c1cf3ded6471246fb6366f929358021