Switch from 'object' to 'dict(str, str)' so that the labels information is not lost. Change-Id: I971ef230cda8b2ba5997ab71c622323956fcfbdd
Change-Id: I37cfdc92f1ff9cf4ff96b9d0ca14e3b777890ffc