merge to: 3.14.25-ti-r38

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
merge to: 3.14.26-ti-r39

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Merge branch '3.14-ti' into 3.14-ti_for_uav