DO NOT MERGE: Fix CTS regression am: 90be39c7bb
am: db9f504522

Change-Id: I83a02495ec4116d2bc2001325037f5864bb92c9a