Push up to 5.4

Change-Id: I049a95b7525628e870d916c5bf23ab6fb6348c16