Test: manual bug:130221551 Change-Id: I66cd11ad3475f168a2caf72183a184d7cbca302f (cherry picked from commit 8d123f46)