Bug:317934814 Test: Existing tests are not impacted Change-Id: I3688ee6ee03f2b40f9b455eb7ec3f1049744c7a9