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

Change-Id: I3b2372a6de4107c5c37ef884ac7a9dede04d1c56