[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 am: 0b210196 -s ours
am skip reason: Change-Id I0f16868a526d2ea4b17acbd274cb2359f93166f5 with SHA-1 48794878 is in history
Change-Id: I3372e14e84abd94e09df3758f179da3ef7383da4