Fix merge mistake

Change-Id: Idc677873de9b5cd53bc9837ffc9d6449d389e71a