Bug: 10312832 (cherry picked from commit f0b79aee) Change-Id: I0d78725d47009553f9003ccfba06f70f178a6ec1