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

* commit '3389e26655c2f5a72a033a0a464b5386849561c0':

Change-Id: I777c862489e36b0e13510f8c770675f55dee0121