Merge a2e80b59e42affd4f4cc2f87ece40527de938f75 on remote branch

Change-Id: I7afb376c466562225b8a25f53e411d074fa6f3ec