Merge: leftovers

Change-Id: I25c034d8a2bf2ccb01b6a40e48f0878f0e69da78