Merge "Fix NullPointerException in ActiveService" into rvc-dev am: b7b84697 am: 1f70f0a5 am: 1e4a17b5 Change-Id: I357a942020b34683a5a5d3f79a56c86ab3bb0838