Merge from jb-mr1-dev-plus-aosp

Change-Id: Ie818c9b62cccc595b1d8538418d5591eb0538722