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

Change-Id: I512e4ddac234c7d2b229b30794443cf2280199ef