Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I48fd15262f3c997823955a9b02e13710e69f0bda
Change-Id: I93a79984cac77a32866f206b65185558a1af97a1
tree: 7797ccc99291c712016daedfb9e68bdee4d85cf2
  1. tests/