Bug: 361850561 Test: Manual Flag: NONE Dagger Integration Change-Id: Idbe19f1aa747f519417e21fe8a23a41c52ececc1