Merge "NumberBlockingTest: wait until user started" into pie-cts-dev
am: a2220352ce

Change-Id: If1e33410296677245d4c06ccc9accd44d7aa4935