Merge changes from templates-sdk to templates-sdk-dyn.

Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
9 files changed