Merge "Throw an exception in case of parameter mismatch of precomputed text" into pi-dev
am: a4d970ea40

Change-Id: I588313c38683f0fcd003f77e909e23d6b3df83ce