Merge "Fix issues crashing with Fatal signal when calling getFormat" am: 1808b0e3e4 am: 93b375b781 am: 4fdfda5cd2
am: 2c47cd273e

Change-Id: If3600c777454e1cb2b3307bae87eac9e551f94a4