Add controlled launch of vendor services am: 38da431cd3
am: 42ff1525dd

Change-Id: I5a6dcf92e6f81159ea8017ae62a63fd675cf2d99