- Refactor module Change-Id: I09258e18d50acb57501ea1b47d9422dad857607e (cherry picked from commit 8d5195fdf2)
8d5195fdf2