Merge from jb-mr1-dev-plus-aosp

Change-Id: I6ffd5eb159dbec6bb8819689c28dcf2b0778ff38