CM merges and commits 4.4.2_r2 merge

Change-Id: I3f3d67107163ddf3be5b40b542ec50864c7ab068