Bug: 30090247 Change-Id: I2ff9529a3dd5f197f2d142ef2993d5d8e90b5645 (cherry picked from commit df915bbb)