Reconcile with jb-mr1-release

Change-Id: Ibc7b4524bee9979836a9c7610fb69cc64bf9624b