Merge "Unit test for UidRange.java and UidRange.cpp" into nyc-dev