DO NOT MERGE Fix cts build
am: eb404e8

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

Change-Id: I7688294c3517ffdede1c7bca5003d1be19ce9503