am 2f625713: am 3951caec: Merge "Fix test break due to API not working as advertised." into lmp-sprout-dev

* commit '2f6257132dd8d84c4cc06fff663523fcaabf933e':
  Fix test break due to API not working as advertised.