Merge "make MATCH_FACTORY_ONLY @SystemAPI" into oc-dev
am: 1b782bffdf

Change-Id: Ia15934bb7a40be04d32c0c9418ed8a8d8bd2c1c7