Merge remote-tracking branch 'origin/dev/tsp-to-l4t-r24.2' into l4t-r24.2
Igor Nabirushkin [Tue, 8 Aug 2017 14:49:44 +0000 (17:49 +0300)]
Bug 1968122

Change-Id: Ib0a684568442cd15b6fcb1cdb8e50fa56289f2ab
Signed-off-by: Igor Nabirushkin <inabirushkin@nvidia.com>


Trivial merge