Merge "Keep sensor events for default flush operation" into oc-dev am: 657062dbe7
am: 9e4179e27e

Change-Id: Iac52175dcc6511542f6dba917e094bf6a43be460