am b417e6f3: am 8e2526dd: am 18d5c213: Merge "Increase timeout when removing active admin in CTS" into mnc-dev

* commit 'b417e6f39484ef5fe3b911344963bd0e5a749e9a':
  Increase timeout when removing active admin in CTS