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

Change-Id: Iff4148b0409ebaeb03ffb6998ce9624623c9c180