sync the sdk and ds templates so we can move toward one template set Change-Id: I5316d4cd085734a47953beba203ba8beeb64549e
Change-Id: I0bb0238326aed7d2ff931594709cb153b2587061