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

Change-Id: Ia9ac4bc023a5d43f04e48aafe72d7de69d1923b7
tree: 9b4bca414ad20f7d81c31ea9d22810544d613ee7
  1. kernel