Change-Id: I370aa5084a4e3eb94168b96df94dbbee606adaab Related: OS#5599, OS#3761
Change-Id: I1a3703e48507cd51cd8198f13b993f54c44bc41e Related: OS#5599, OS#3761