Merged updates from jb-mr1.1 branch of aosp