Merge \\"Increase sensor registration log size\\" into nyc-mr1-dev am: 6118fb85d7
am: 26af1e0419

Change-Id: I17f8653afdc18ef0690f8b7a129b474fbed4ecfe