am ec18268e: am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE

* commit 'ec18268eb42641cd2a6ae9c8b26e35d67bb41021':
  Always clear settings when entering Inactive state.