am f7f93048: Merge "NULL should not be const for RS."

* commit 'f7f930480c75bcb57ae98d4a0fc59a3fb8e90e3d':
  NULL should not be const for RS.