Merge changes from topic "revert-injectors" into oc-mr1-dev
am: d33fe05c66

Change-Id: I7e66180252232f22e23e68b8aec7eedbd2bed82b