Cherry-pick If917097f97d0239aa2ebdeabe863b5786e92230c

Change-Id: I43adaeb2231ae47858aa47bf08403adc2e1a56a4