Merge "textContent will used instead of innerhtml it will avoid xss attack and secure it   Change-Id: I168dacb414c4de66bf591260a7b1eeb201f1c90e" into main