fix build am: cc17d003ee
am: 6007caa57e

Change-Id: I01612087d09d58d053d0161ba0c19959b7a574ef