DO NOT MERGE: Fix CTS regression am: edc9238514  -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e  -s ours am: 1559998d08 am: c3485668ad am: 174f17bc19
am: cf94d53469  -s ours

Change-Id: I00e4f8f8f0e6a98bee0212dede9362297715127a