Fix previous commit (chart2 part)

Change-Id: I9d6491f484eb2a8989b7e3594ca2edf702557b12
Fix previous commit (svx part)

Change-Id: I58fb2aca452935c04c498ee63c3b4060b1ebc50e