Test: Existing unit tests, manual sanity check.
BUG=35764483
Change-Id: If6ac121452698747e1f8bc9d4ec0111bb881d4d4
(cherry picked from commit e9956c5c65)
Test: Existing unit tests, manual sanity check.
BUG=35764483
Change-Id: If6ac121452698747e1f8bc9d4ec0111bb881d4d4
(cherry picked from commit e9956c5c65)