Merge c58ee82d9442e6c1f596c80f9c755ccf638821b4 on remote branch

Change-Id: I34a9492934c184327af6562e3c8444979050f6f3