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

Change-Id: I74fae8dc3458adbc421d2589510bc858b1d2d79b