Merge "Add HSM AID." am: 4723d7c66d am: ef1dd0d279 am: a3f425950c am: e05c35a10b
am: b6d65c1e65

Change-Id: I70918ea660979fa854ac651d44602a10aca49ce0