am ea653eb8: am 9123e666: Merge "Update cached child enabled state before...
am ea653eb8: am 9123e666: Merge "Update cached child enabled state before selector state" into mnc-dev
* commit 'ea653eb8':
Update cached child enabled state before selector state