Merge "Merge commit 'android-4.4.2_r1' into merge_branch"