Test: unit tests provided, verified local build is not failing Fix: b/33343558 Change-Id: I96d0160d1dde1e527eaba3982b0a48515e9bccd7