OS2SD-multi squashed commit

Change-Id: I41b94a9bba0ba1bcc877587abdb91161013d4f3b