Merge 50d4426472be9423cc075be7c94678ae86d1d6aa on remote branch

Change-Id: Idca73b22c3bfe51d159eaf9df5200ce9192d6a1e