Merge "Bug fixing for AOSP refresh."