Merge "Alter condition for starting RulesManagerService" am: a338679173
am: 3e928af733

Change-Id: I885b05915d72d284784e1eabe548a9aef048dbc5