Merge "Bidi wrap owner name in account setting page." into pi-dev
am: 8a3bcaa3e3

Change-Id: I76c750048387a0886a5dbf4cd3de3fde5ccc56d0