Reconcile with jb-release - do not merge

Change-Id: I586debc586c0de8fc24359daa40cbee9e58340ab