4.4.4_r1 -> 4.4.4_r2

Change-Id: Id51ee5e2da1d13fec5fea8dd3ad6c24464a2fd7e