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

Change-Id: Ie79ccfbf101b3a7144f7a7a80d1af7bdeb53cae5