Related: OS#5187 Change-Id: I8dffe950b0f041a231708521d11b027bfbd304e3
Change-Id: Iefa6e65c7a03b232a124758cf8890b660abf6885