Merge "Add command line support for testing tz detection" am: 86fd801bff

Change-Id: Ia1060d6120c3572dc74a47256e1a1735aef08dbd