DO NOT MERGE: Adding required loganalysis changes for tradefed merge into qt-dev. am: c7bcaba872 am: 4035b6cc11 am: 6b5d88ae4c

Change-Id: Idb5cb9478b9289836bad6d61063d4a6b95a46fb8