Merged updates from jb-mr1.1-release of aosp