restoring Q behavior Bug: 160933537 Test: TH Change-Id: I66e5b743f1e61f744f9aad2248a9b619fd9b97f7
e69b8a9006
53f6fe0a82
75e21ea878
0d13b1b5cf