[automerger skipped] Merge "Not using dropbox entries before the test start...

[automerger skipped] Merge "Not using dropbox entries before the test start for diagnostics" into ub-launcher3-qt-qpr1-dev am: dcb5412e
am: 52b1ff20 -s ours
am skip reason: change_id Ia060b5d2b98ea9ea3b6e61ae11d610f1a888d7a0 with SHA1 6a585df8 is in history

Change-Id: I5e7e24a08850c26b415b1316d834b2cef30c35f3