Merge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29 am: e373209b97
am: 614f7aafdc

Change-Id: Iafee32f071387ac36faa42cc9e3812109f769a8b