Merge "While turning OFF do not honor ON requests."
am: 104518e4c4

* commit '104518e4c430e6e9a6bad44b9f18086d3c6f60fe':
  While turning OFF do not honor ON requests.

Change-Id: I7ca5d9592444d5a6ed4fd4dc635d871c60ba8ec0