root: Update from Moto 4.4

Change-Id: I6f50e0850d760d46a450a42752416df2b77d200e