Merge "Clear identity when asking for other users." into pi-dev
am: 8eaee9eea5

Change-Id: I64d1f725fe0653ef4512e73d92f411de78664989