Bug: 26814204 (cherry picked from commit 311a97e7f4) Change-Id: I3fab2b12676bd1460553b4cb45b1ff602f6c09c1
311a97e7f4