Merge "DO NOT MERGE Fix the null return value of getTrustedHardwareCertPath"...
Merge "DO NOT MERGE Fix the null return value of getTrustedHardwareCertPath" into pi-dev am: 61683747
am: 6eebec68 -s ours
Change-Id: Id499daf8084b95a4a79e54a4c91038be4d9427ec