Merge "Fix inequality typo in StreamIn::getCapturePosition" am: ba3225718b
am: 3770968cf9

Change-Id: Ia0310363cce5aa004844cf77edafcdc78cdc5011