Bug: 16853291 Change-Id: I0c2e2efbeb5060d4ec5ba706dab422b3c2caaa96 (cherry picked from commit 3bed41cf)