DO NOT MERGE Fix cts build am: eb404e8 am: a7a0ae6 am: c5e302e  -s ours am: cff77ba  -s ours am: 2851e36 am: dfb37fc am: df5c658  -s ours am: cdebbf5 am: a58a183 am: ff7aea2
am: 3c5c3e6  -s ours

* commit '3c5c3e61c4dcbb3d5c41552bd2345997a91ec34c':
  DO NOT MERGE Fix cts build

Change-Id: I9f0531c3d58ac6c1adb13735755ffe629e568ae4