Merge "Use @ConnectionPolicy annotation more consistently in classes with...
Merge "Use @ConnectionPolicy annotation more consistently in classes with methods setConnectionPolicy and getConnectionPolicy" am: 4328fba8 am: f38016bd
Change-Id: I362075778f4ef6367e179bd2ee447d86bf6c6424