Merge 347f50fe604cc4f126d0c78828b4c06db8ee4133 on remote branch

Change-Id: Ic7ef672dc75ce6e11c9b5d452a9da6267e76c6e2