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

Change-Id: I7419bccad765da9b8723501d75e19683ccd08411