Merge "Not hinting anymore when in power saver" into oc-mr1-dev am: d499ae5a85
am: 326be6c948

Change-Id: I41d0fa03fa1726c22c1ce43c0f76c9a00b9b2031