Snap for 8947017 from 552a9119e3cd4402c72e69c828ce525a096c87bd to mainline-extservices-release

Change-Id: Ic582a691859b21b0dce40d0c0c3abd58d75c9d52