Merge "Fix strstr16." into nyc-dev am: a34a383607
am: 30a1db7045

* commit '30a1db70459edd8a065cf25307284631934b5a0d':

Change-Id: I8f86aebebbcd9e49da2175a33fcea41639942e3d