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

Change-Id: Id7a41d6b5c55960694407d194c496766eaefb5d2