am 436bb545: Merge "DO NOT MERGE Update Test Expectations" into jb-dev

* commit '436bb545ac93eabd994a4fbe814191585c3cc410':
  DO NOT MERGE Update Test Expectations