This commit breaks ub-setupwizard-master build Test: ./gradlew connectedAndroidTest test This reverts commit 1dcf260b.