163c5aa780
Also Changed container names to static. Change-Id: I51f53b480d18aaa38a9707429f01052ee122e7e9 Signed-off-by: diwakar thyagaraj <diwakar.chitoor.thyagaraj@att.com>