DESCRIPTION

Merge master

Change-Id: I94d602bc9d8bbc8be2a2ffb8769baf8011be0608


COMMENTS

author: Titus Ho
date: 2016-11-10 19:50:39.635000000

Uploaded patch set 1.

-------------------------------------
author: Titus Ho
date: 2016-11-10 19:51:04.489000000

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

-------------------------------------
author: Tate Garrett
date: 2016-11-10 19:51:10.542000000

Change has been successfully cherry-picked as f7fbdb573bdcecd908a1a6fc92a1c4057ea686ad by Titus Ho

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