Merge e7cbb5cf0247e91bf540fe3e558163a4c83456f0 on remote branch

Change-Id: Icaf99c82b8e1eb592be8669d0db7334b97c5d215