Merge "Add boot user override id to its own label" into qt-dev am: c875a51882
am: 8261ee9445

Change-Id: I282dc519aad0ab894668d259b72af0799617ac1b