Merge 8faa415c9ed716d179c81c17944a508e59cbb61d on remote branch

Change-Id: I4ee697e8f4cff0e53b9c656b038854292fe35644