role reassignment tweaks

Change-Id: Ie6d412787330e67a13e605a34f0824cf70882f85
11 files changed