Added in 741c02c4 Lost in 1a58b7f6 Bug: 18248300 Change-Id: Ie5afdaf07d7b994e94decd928c6e0a28e49b4b78