Merge c50239fe4066498aaf83238f28ffee304d7905dc on remote branch

Change-Id: Ifdba44d7ad4e7c11ed578510f6283b2cb3b5ed8b