Change-Id: I59db35116ec7215a1b8e2ae7dbd319fa099adfac
Currently that is the only place using it and it's tied to zap implementation. We don't want to have zap in common to reduce common dependencies. Change-Id: I72c064008f83ad3a8a3aa21944753208d4844c85