Merge "Fix sensor uuid, retrofit recent event logger" into nyc-dev
am: cf43c26

* commit 'cf43c2654da64f12d0803c66dd75525b3f1ab09f':
  Fix sensor uuid, retrofit recent event logger

Change-Id: I2f9346baa1d208955e6ec8714f9990b92250e4e5