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