Change-Id: I69496b8216adaaf10a3c8e282eea34ce5ecc94cf Implements: blueprint static-datasources-changes