[automerger skipped] Merge "Change stopwatch accuracy from milliseconds to...
[automerger skipped] Merge "Change stopwatch accuracy from milliseconds to microseconds" into rvc-dev am: 59b66b8f -s ours am: 8d884c18 -s ours
am skip reason: Change-Id I5a27a3b1316c67bf076b2e490860385267358ef8 with SHA-1 fa914145 is in history
Change-Id: I34adea7741702a5f8daa8948fde5abaf0a92032e