Merge 4.4.2_r1

Change-Id: I9f04f092383b57775b1660d55f8c2a9d549179fc