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

Change-Id: Ifb0a30557854004e5a4c90944908a91d70ceb8c6
tree: 26b6251d2830aa28d9e31410f4c856623555b7d6
  1. etc/
  2. loc_api/
  3. utils/
  4. CleanSpec.mk