Adjust code structure for maintainance. Bug: 259611847 Test: auto test Change-Id: I6710aa814441c0858c712f416ffddde44081d4d1
ba69fd0d3f
d5ab7dc729