Merge 46862769a5bfde708b58f36e62213814fbeae6f2 on remote branch

Change-Id: Id03dc17af4a843a363f1dedb96cb36d53de39ff9