tree 593eaa6fa2798d1ccf8dc9d3b6ba059822016003
parent be15d2d70fcdf9b22beb56c4eaa1854565ee5bd3
parent dfb6a0fdb9e8cd458c28d92c6a26bd88a0378a37
author Junyu Lai <junyulai@google.com> 1581735083 +0000
committer Junyu Lai <junyulai@google.com> 1581735083 +0000

Merge "[SP16] Address comments on aosp/1172143" am: fc9e4fbc08 am: dfb6a0fdb9

Change-Id: Id6d4be756ec4bd6d3e9c7b8fa1d85b3bdc802a10