Merge "Not using dropbox entries before the test start for diagnostics" into ub-launcher3-qt-qpr1-dev
am: dcb5412e1c

Change-Id: I70b2434f162f6575a88bcc0b43bdf8cce1cbc359