Sync with jb-mr1-dev

Change-Id: I5bd4d44e0e33d28487c04a27652469697478ecd4