Followup g54130

Change-Id: I925b538f1b15280ab10fdfe79b6c93e0a004f0b8