Manually merge changes from giant AOSP topic

Change-Id: Ib64f9a5480b83acb2ef855d5c45a7defcdd5be8a
main
Stephen Li 2017-12-07 23:29:32 +00:00
commit aa43373fb8

Diff Content Not Available