Merge "Do not throw exception when there is no omapi reader supported" am: 1fe83df53a am: 8c948867c5

Change-Id: If6af01cbe79f9f3a6802924814ee648366d7eca5