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

Change-Id: I2bfac06d596a0dc57975033a0bf1a4d61965153c