Reconcile with jb-mr1-release - do not merge

Change-Id: I60dc4bad2244ed88aec29926b08dcecf3a07462e