Ddm: Merged updates from jb-mr1.1-release branch of aosp
Input: Merged updates from jb-mr1.1-release branch of aosp
Database: Merged updates from jb-mr1.1-release branch of aosp