Reconcile with jb-mr1-release - do not merge

Change-Id: I602a06143ddd4a8de1569b7b2e33ce54c46356a9