DESCRIPTION

More backports to fix sanity in 4.6.3

Change-Id: I53d7aed568deec9674c1db426e0c89021080d4cc


COMMENTS

author: Jakobe Johnson
date: 2017-08-03 00:31:07.690000000

Uploaded patch set 1.

-------------------------------------
author: Monique Barker
date: 2017-08-03 00:39:49.928000000

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

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