Merge "Update expectations in SetVerifierDeps/SetStackSample."
am: bbf3311144

Change-Id: Ie8034aac520e01e4e86d1d9769683e188463488d