bug:27865109 (cherry picked from commit 95bc2f29) Change-Id: I56e21714bf803b8fefa2bd8087cd385c7a57564c