DESCRIPTION

Incrementally fixing changes that were somehow reverted.

Change-Id: I16e512ae591ecd0b41fbf7d73bf17c568fb5f5ac


COMMENTS

author: Jakobe Johnson
date: 2017-04-26 00:34:26.229000000

Uploaded patch set 1.

-------------------------------------
author: Jakobe Johnson
date: 2017-04-26 00:34:34.313000000

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

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