Merge "Update the way OMS records details about overlays" into oc-mr1-dev am: 15b42b89b8
am: 11ab7f7b82  -s ours

Change-Id: I91e9d37fb5b4024f3272a7f968d7885ea88a2244