[automerger skipped] Merge "Sequentially handle enable and disable" am:...
[automerger skipped] Merge "Sequentially handle enable and disable" am: ad9664c0 am: 255c74b0 -s ours
am skip reason: Change-Id I2301ba22b6c10fcea71e3b66eea3ea0a0d7f0475 with SHA-1 76f76cc0 is in history
Change-Id: Ieb5422b02d4f70e8c9c642ceffc28f97e4a49631