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

Change-Id: I69aac49027bb64539da78406637d3bbce26d0e77