Test: manual Bug: 111746860 Change-Id: I1d88bcf81efe71d622bcf3056a6d7c1a4c793383 (cherry picked from commit a651b783)