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

Change-Id: I8c44904def148550022af390ceda87a2d4007c48