Bug: 17813018 (cherry picked from commit c891e24073) Change-Id: I4e891c2dbad9ea00d2377c5175317d9ae3840153
c891e24073