Merge "Add an init service for setting sdk props" am: 6a8eaf415d am: 49aa386a67
am: 6606c53996

Change-Id: Idee2ce67e0a5394820a78595701f7fde1a317b20