Merge \\"Do not launch non exposed add printer activity\\" into nyc-dev am: 737be111cc
am: 89fe3e0169

Change-Id: I180895d413d789166609a1b5f95c3afdcb027137