Squashed commit of JLS36D->JLS36G(4.3_r3.1)

"JLS36D"

"JLS36E"

"JLS36F"

JLS36G
Merge "Squashed commit of JLS36D->JLS36G(4.3_r3.1)" into jb4.3