tree f7fcc7dd17529722004b6b5cb07a27e3a98a3795
parent d1f141a6d010636eaa42b45e481d37f5b5d7afff
parent 3b2b22f181a0de40a226d6672d159225fe263686
author Xin Li <delphij@google.com> 1498060535 -0700
committer Alan Viverette <alanv@google.com> 1498164115 +0000

DO NOT MERGE: Merge commit '3b2b22f181a0de40a226d6672d159225fe263686'
from nyc-support-25.4-dev to stage-aosp-master.

Bug: 62846313
Test: build
Change-Id: Ibfcdc70369a4f24ed1142af6873e6dddf79f4296