Merge "Rename undefined inset constant" into nyc-dev am: e2578e2d9e
am: 28939cd3fd

* commit '28939cd3fd27cce5c015de5e219ae361004fd959':
  Rename undefined inset constant