Merge \\"Trigger transparency dialog only if restriction is set by admin.\\"...
Merge \\"Trigger transparency dialog only if restriction is set by admin.\\" into nyc-mr1-dev am: 949da454
am: fb66977c
Change-Id: I4df423775148ac8d4d18242143505a4afa0c62a7