Merge branch 'smew' into main

Bug: webm:1732

Change-Id: Id782a897d8005d316dc5b72859657c219edabf30