A significant part of #1136. This is a rather large cl, because all of the primops need to be changed together. Change-Id: I7d92698d5344bd6186ee4fa47f5c21966a6a6964
A significant part of #1136. This is a rather large cl, because all of the primops need to be changed together. Change-Id: I7d92698d5344bd6186ee4fa47f5c21966a6a6964