Fix build am: 581669db59
am: 2eaea8d703

Change-Id: I5525003c2e7fc088516e51f636b45f1edabc445e