am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."

* commit 'd66a92e6875bfc835adf0b100607afbf4bfc2761':
  Eliminating dead code with no other effect than consuming battery life.