Reconcile with jb-mr1-release - do not merge

Change-Id: I3e2d9d32a15a2cc3ac8d3f7f25a92ddcbcc4b093
tree: 1dd9fbc3691193b7ef6bbf7f1f16be2803104a58
  1. kernel