Restore OM tagging for 470-07.

* For point of reference, see Ib7d82a0d642aaeda1c2158f1c9fba6aa1dfedd83

Change-Id: I0d1140456e9fa867bf5318851be68e0d57afa907