Reconcile with jb-mr1-factory-release - do not merge

Change-Id: Id10debd2e64af961f6403e735f066bd7f305d8ea