Story: 2008862 Task: 43154 Signed-off-by: Scott Little <scott.little@windriver.com> Change-Id: Ic084a9b637534bf863e6a010eafa65f419ff8748