Bug: 206337456 Test: Cheked generated files after compiling Change-Id: I9cab77bde0cb8e4a8a38320cbb7f394cc3b68e7e