Merge "Remove three no longer used static consts" into nyc-dev am: 5601a79 am: a9689cb
am: df8d051

* commit 'df8d051f416f325c984fb2b7f3aa2f56e4c21ef6':
  Remove three no longer used static consts

Change-Id: I6ac57531733a4d47f1cd3dd1381d21785580a135