DESCRIPTION

Backport some fixes to tests that were fixed in master.

Change-Id: Ia666fcacaec54c1ad8f409d458ac4603bcca84dc


COMMENTS

author: Jakobe Johnson
date: 2017-08-02 23:28:39.009000000

Uploaded patch set 1.

-------------------------------------
author: Nelson Emerson Dukekson
date: 2017-08-02 23:32:07.830000000

Patch Set 1: Code-Review+1

-------------------------------------
author: Monique Barker
date: 2017-08-02 23:42:31.308000000

Patch Set 1: Code-Review+2 Verified+1

-------------------------------------
