Reconcile with jb-mr1-release

Change-Id: Ic5a38ec8411772c4bad01c3431d284d54b3c3d23