Bug: 19517541 (cherry picked from commit 44387e81) Change-Id: Ib754c1cbf03387de87a00fb122fb01666b6e0407