Merge "Merge remote-tracking branch 'origin/dev/tsp-to-l4t-r24.2' into l4t-r24.2...
Gerrit Code Review [Tue, 19 Sep 2017 21:00:43 +0000 (14:00 -0700)]

Trivial merge