Merge "Revert "Revert "Cert for HAL adapter""" am: 1bc6c42328 Change-Id: I8ccd9a439f0e30152290139049b3f1d24f26ba14