Updates from moto 4.4.2

Change-Id: Iaf5cee4ac20cbab78320a7125a75353856f8b67c