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

Change-Id: I7771055351d614804d48baee0eaad769c917ae82