Track Legacy's Gerrit

Change-Id: Ic8903ef4c9c528a4b0e39b4e9874db74b4b4af19