Bug: 16874447 (cherry picked from commit 5df0839c) Change-Id: I9280505c0c1c3b5da24ba590448dcd6e7a230406