DESCRIPTION

Revert some changes that cause test failures.

Change-Id: I6aeb56888cb2387dd7c3767f56ae6a8fd4ac535f


COMMENTS

author: Jakobe Johnson
date: 2017-09-19 21:09:43.200000000

Uploaded patch set 1.

-------------------------------------
author: Monique Barker
date: 2017-09-19 21:13:19.379000000

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

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