Merge 64cf530c52321988f34f8392bfc73a34379962d1 on remote branch

Change-Id: I07757678ae2a1ea6d87ad07f4df7e09479f07472