Merge 373f8b915f526919151f229ff211038e62c300c5 on remote branch

Change-Id: I2df8af80c466bbc8c92e0a5c8b04fcf5c3ae3b50