[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 828326eb is in history
Change-Id: I36a75a5a3820857565e3462729c7d2c1a2237f57