am 401f68b9: am 510f03c5: am 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev

* commit '401f68b93aa9eca88d8dd126b92128bdc3371064':
  Fix issue #24571425: Device does not come out of idle mode for maintenance