Merge "rcs_aosp: aosp code submission for patch set6"