Merge changes from topic 'am-cca20719ce864a0298fe5d9833985170' into nyc-mr1-dev-plus-aosp

* changes:
  Merge "Remove unused function declarations" into cw-f-dev am: 6199f023a7
  Remove unused function declarations am: 47c3ecb53a