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