Merge 92759dc65d41a23fe3b822bff9e9e7185e049bb1 on remote branch

Change-Id: Ie23aad0f0c16a9943c70c887f60cf627121cf24d