This change fixes the incorrect merge conflict resolution of
3b17896950
Bug: N/A
Test: m
Change-Id: If00db9ab9758384a2def5442fbeecb36615d2ec1
This change fixes the incorrect merge conflict resolution of
3b17896950
Bug: N/A
Test: m
Change-Id: If00db9ab9758384a2def5442fbeecb36615d2ec1