Merge 15d46a65e22c9c0981a3e56c775d3baee073b374 on remote branch

Change-Id: I644a3c27205f4dd9344ab822f593424c18d8b7af