DO NOT MERGE Fix cts build am: eb404e8 am: a7a0ae6
am: c5e302e  -s ours

* commit 'c5e302e2452e3a75dc1306e1a88f83185f522f6f':
  DO NOT MERGE Fix cts build

Change-Id: I7cf2405c7f857c056fb255b1e18f6c7b05b4e326