Merge "Remove warning" into nyc-dev
am: 2aaf681

* commit '2aaf681dc04bb5bcfe7b3056dd42dea1f3ef0bdf':
  Remove warning

Change-Id: If3c7d51070c89f9272782d4a27c5cde547881f56