tree 194fb1e7cef558fdfba7c57db144eca74a67079a
parent 82337e6a0b300041935064081813507642cbf2f3
parent 09173387a12e70708e0985aeb461ebbbd8a84fe5
author Xin Li <delphij@google.com> 1483984627 -0800
committer Xin Li <delphij@google.com> 1483984627 -0800

Merge commit '09173387a12e70708e0985aeb461ebbbd8a84fe5' from nyc-support-25.1-dev to
stage-aosp-master.

Test: local build tests
BUG: 34107289
Change-Id: I1dff75f96b55e1aae8bc667840cf13aa129e38d5