Change-Id: I7e3b24e92b2a16de857e0424c85232cc31444182
Test files can be updated with --test_update_golden_files if needed. Change-Id: I5aa904634450f8963f55c46ab5fe0b63f67fef46