tree 66474bc54ab1b8b7a998d00f8af6bca432b038a6
parent 0435f1e8af934e4205e4cdeaee80d61aa7718d56
parent 6ef2e681913c71fa948cc94e32d665a715920313
author Stephen Li <stephenli@google.com> 1512689179 +0000
committer Stephen Li <stephenli@google.com> 1512689179 +0000

Manually merge changes from giant AOSP topic

Change-Id: Ifeb84090a15e9b35a6841bb7243908f4f34aa66a