tree 09535ed1ae3a95db55fe6d6394146db04765d476
parent 2da6d8498a8af32e93c24adf480e60427d0f9171
parent 1148147c4c06d9d5390c7b7c8b0ca5e0c245fc4a
author Chia-I Wu <olv@google.com> 1525731831 -0700
committer Chia-I Wu <olv@google.com> 1525731853 -0700

resolve merge conflicts of 1148147c to master

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic1f4b4a5e3390a1153af59197ed39cfb10856b31