DO NOT MERGE: Fix CTS regression am: edc9238514  -s ours
am: 0fb1075d95

Change-Id: I1a019156b580ec594afbb866bb7aec342de8e636