Merge 2 commit AOSP