Related: OS#6042 Change-Id: Ia5bf7708d11421710f3a88669d94c4f01060cdd6
Change-Id: I73b988220d58c36de99baf43e88ac70f646bbe3a