Merge branch 'tmp-branch' into HEAD

* tmp-branch:
  FP2-90: european language support
  FP2-84: remove the default build id
  FP2-84: remove the default build id
  FP2-033: Make OTA packages rollback-compatible
  FP2-15: create Product ID for FP2 project

Conflicts:
	core/build_id.mk

Change-Id: I521971c0df9567eadb9f29efaca7781012ad2fa8