Reconcile with jb-mr1-release - do not merge

Change-Id: I916d5d2df8ba081a431b8eb5a999e3e07f789e96