Merge from jb-mr1-dev-plus-aosp

Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3