Merge 34b4b0c929b3113aff694c676321e20a07e01277 on remote branch

Change-Id: I195b2dc3b6c115c59541faa44edae2b9b265461c