am a5fa3b21: am 52d378bc: Merge commit \'698997b9ef47f215350f03c0289f291846cd3604\' into lmp-mr1-dev

* commit 'a5fa3b21247ef211eb8225aec96cb7683d161ed2':
  Add null check for exif thumbnail size