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

Change-Id: Ie26828f23d760af36f922a66c0b7c45f8a7e4945