Workarond and update.

Change-Id: I17acea358d5bb7c9a8b39b5613f5ccf92c2669d9