Merge "Ensure only test print services enabled - framework" into oc-dev
am: 053fb9120e

Change-Id: I5f07488ba286cb3d01c75d96e1003edba845daf8