Merge "add changes to make the add user button up to spec" into pi-dev
am: 5b510f5c7b

Change-Id: If2824fe6db7094dc9d2c674976eb5c1669b21f82