Change-Id: I16931919a26c16a0d701771c93fa7fe1c6f60ef8
This is to help implementation of bug #8181262 and maybe bug #8181261 Note the current code has not yet been tested; it is only known to compile at this point. Change-Id: I489674c96d0d3fc0ddacc92611931a19a9ee5230