Bug: 16024763 (cherry picked from commit c5d824a2) Change-Id: Id5dcd4c8a131b93de00023c3ae9f518ea182614a