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

Change-Id: Ia0803133ed71814ca841161e3039c7268a8fc691