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

Change-Id: I2315f73a3f84ba1f454f9a76690d1b959508e607