Squash Linux v version 3.4.47 merge
Merge "Squash Linux v version 3.4.47 merge" into jb4.2