Change-Id: I727a2bb1e28ae9158f2df9c74dd0aee977dfd47f
Change-Id: Id747767377953fd644a538aad3f603d6c50875a2
Bug: 8181262 Change-Id: I3d3f20453f6c6f2756c988363c5b5453ef309cb6
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