Merge "Don't skip intents where config changed." am: 29a28235b8 am: d2e44e8d11
am: f94abc1009  -s ours

Change-Id: Ie32e48f15e13d08ea3ae1a4d795131000f3d50e6