Related: OS#4342 Change-Id: I936220e95a3334d8052bb2c52fbf335a8a5c3711
Change-Id: I985805aea0e48fe70619de8b81206098e4e37613