Fixes: 130040716 Test: treehugger, internal unit test Change-Id: I3fcc5e041d6e4eaa5d2d4ab75f9a645e724fab1b