Cal refactor sync - Ver3

Change-Id: Ib9464cbbce79b837938b0139321f5bc6dbdd9878
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
2 files changed