Sync with jb-mr1-dev

Change-Id: I31e76b5a358c14d5194eaf02b08a728d1ca9b4c5