fix a small errors. Change-Id: I96c16e137a0c32552b8985b1444aecc86e816e3f (cherry picked from commit c02a073c52)
c02a073c52