Replaced sample package variable name with actual sample package across samples. Change-Id: I3f747519b2e12030059b61d55df631928694e592