Merge branch kitkat into aospa