Merge "Don't crash if media metadata isn't available" into rvc-dev am: b9bd2964 am: ba87cea7 am: 999639c2 am: e9cee5ab Change-Id: I4dd682ffce3e0f17a02ec8d626ebcd8734ac25f4