Related: OS#6272 Change-Id: I4a8cb558816534ac942bc38ff0b178849d610457
Change-Id: Ia427eb62bbfecea12c31584996a57cb82aa097a0