Merge "CTS doesn't like swiping." into oc-dev
am: 24ced03e01

Change-Id: I512f09373ce950cc635d2cfed64833bf2fa5c7d3