Bug: 16689428 (cherry picked from commit 38eecb0f) Change-Id: Id4a1bde9012e4dd333493e46997c200537c9cf55