Merge "Re-enable chips in qt-r1-dev" into ub-launcher3-qt-r1-dev
am: 067bce7d8a

Change-Id: I40b4ff9ab22af909d0a1cc32cca2f9dbc7528700