T4xx fixes

T404 WONTFIX

Change-Id: I2e94fa4762615b686635b82e1843bdc1c10dabb0
Merge "T4xx fixes"