DESCRIPTION

Backport a master fix into the experimental branch

Change-Id: I9ae0488b8774bb043dce1d743ff0bfa157cdf8da


COMMENTS

author: Jakobe Johnson
date: 2017-10-13 22:13:58.389000000

Uploaded patch set 1.

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