Manually merge changes from giant AOSP topic

Change-Id: I758f8cd61341d5dfb394245fb38bb9a6332fdc91
This commit is contained in:
Stephen Li 2017-12-07 23:52:54 +00:00
commit 97ff123fac

Diff Content Not Available