Updated to jbmr1.1-release branch of aosp