Add a work around and create a bug for proper fix Bug: 6882233 Change-Id: I342ef7ecade8b9e2c7d16e82ea9031214b1b4462