Bug: 116352817 Test: in follow-up CL containing CUJs. Change-Id: I0230c1343c2e0f6885340a2f2fa5de06d6e66f1b (cherry picked from commit bee2c432)