Merge "Don't fail attestation on missing app ID" am: 5386377bfb
am: 8bac7ba894

Change-Id: Ie121e89c5eb2373821a1a80a18f8c441e428aaaa