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

Change-Id: Ia8253e4d829837c50cc6f4e7d544d966e501b9d8