Reconcile with jb-mr1-release - do not merge

Change-Id: If8dd7e709eebee87512dbe33d7ed6858a7597593
tree: 3489c48a31d7afbae4c5eff45ad791133e90c2af
  1. original/
  2. CleanSpec.mk