DESCRIPTION

Backport a master fix into the experimental branch

Change-Id: I9ae0488b8774bb043dce1d743ff0bfa157cdf8da


COMMENTS

author: Jakobe Johnson
date: 2017-10-13 22:14:12.355000000

Patch Set 2: Patch Set 1 was rebased

-------------------------------------
author: Nelson Emerson Dukekson
date: 2017-10-13 22:17:27.419000000

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

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