b/37442966 Test: build (cherry picked from commit 46847395) Change-Id: I6b72b9d0d69f42a4f1ca46403647a172bb2c6e84