Bug: 11597000 (cherry picked from commit bf92c35f) Change-Id: I85c14aeeff6e8855f303108b099be12ef6b87a16