Merge 37f6df7e65db93291318d39e254d38320d37d70d on remote branch

Change-Id: I50f3532b5b7ba76acdefa18d83cf39e70627acba