Alligning with jonypx09....part2

Change-Id: I06271134c5b6493a40b51490e6ccb06bb6efcaf1