BUG: 18473380 Change-Id: If3eabf3f233b7c42c1bf732ac82efd034175c2da (cherry picked from commit e62a5673)