4.4.2_r2 merge

Change-Id: Ie18493e221521811075091d6b8deea9534542ed1
Merge "4.4.2_r2 merge" into jaf-1.1