Test: Manual Fix: 329243388 Change-Id: If9507f2aeddc1a5077a39246ac2af2f32b2b94bc
Test: Unit Test Fix: 326191189 Change-Id: I542903b26bac589ba67c297d8758ea0a69ebdf23