Merge remote-tracking branch 'goog/ub-setupwizard-belgarath' into HEAD am: a6a8c70e am: 83ceb407 am: fb514816 Change-Id: Ib78ee3de5531593d23b6f8921223e3d4db1c72dd