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

Change-Id: I5e42752fcf6e1bee87db8c78daaa5d6364a15ee5