Merge "Increase sensor registration log size" into nyc-mr1-dev