[automerger skipped] Merge "Sequentially handle enable and disable" am:...
[automerger skipped] Merge "Sequentially handle enable and disable" am: 27f91711 am: 37c5ddca -s ours
am skip reason: Change-Id I2301ba22b6c10fcea71e3b66eea3ea0a0d7f0475 with SHA-1 820d21e7 is in history
Change-Id: Ieb5422b02d4f70e8c9c642ceffc28f97e4a49631