Merge "Adjust testKillswitchMechanismFieldsThroughJni time out" into tm-dev