Reconcile with jb-mr1-release

Change-Id: I46206f9a16be36aa73de64d71f1ae49b9fef0b7d