Manually merge changes from giant AOSP topic

Change-Id: I77f2407fb5223146c450f99516fbca55ab3aa900
This commit is contained in:
Stephen Li 2017-12-07 23:29:16 +00:00
commit 813b511529

Diff Content Not Available