Merge Kitkat-mr2-release into AOSCP kitkat-mr2-release