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

Change-Id: Ifb14907d0ac210a247d3014235193c13c7e20263