Merge "Added explicit cast so it compiles on Eclipse." into nyc-mr1-dev