Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev
am: 457c58f912

Change-Id: I38573971acf0206ac3a5a8a32ae6a4577628e6a9