Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3fbcd93e4cef710bf1562bc7844f4a62f3146e02