Merge remote-tracking branch 'goog/ub-setupwizard-belgarath'. DO NOT MERGE

Change-Id: I4ad43d6fa75d0872f6bb1ef969cc5cf2bc4a1268