Bug: 17327877 (cherry picked from commit b373ba1b) Change-Id: I6132a8afb4b69c8d22a01b477f6f324c789ed666