Bug: 19043538 Change-Id: Ibf0d6b45868ca90eb792a40c5d1b1395774486b8 (cherry picked from commit cdfebd60)