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

Change-Id: I080c8c2e71488c9799e2730be97ef68db2f7d866