[automerger skipped] Merge "Add command line support for testing tz detection"...
[automerger skipped] Merge "Add command line support for testing tz detection" into rvc-dev am: 278c7083 -s ours am: 0aa3c11b -s ours
am skip reason: Change-Id I0f16868a526d2ea4b17acbd274cb2359f93166f5 with SHA-1 37aff893 is in history
Change-Id: I2809ca73e06eb8acb9375e3bb012e8a681b33a0b