This seems like a relatively simple update with nothing breaking (famous last words). Change-Id: I5498371ad5af3f0f053af633eb26121ea9f780e6