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

Change-Id: I3d22448dbc6de40656b2d5905ffdb8fee88a0b9f