Sync with jb-mr1-dev

Change-Id: I6bc4664468cb2f0b3c55e42859b5fe86231a1b2f