78ba823033
Bug: 17813018 (cherry picked from commit c891e24073830e07ba7373dee554ff2c70e1d313) Change-Id: I4e891c2dbad9ea00d2377c5175317d9ae3840153