Bug: 21066704 (cherry-picked from commit c99b9002) Change-Id: I91fc397f8ea6bdec654eae51b82528ba5843532c