Bug: 123314638 Fixes: 123314638 Test: apex_e2e_tests Change-Id: I2a78a5e7496554c0c3eecbfd28f2d793b4ba2196