* Also fixed some naming typos in the units under test Change-Id: I17f753a122f94dd16f7783f60b5c0eb1c6d3e480