Snap for 7478067 from f5396362d5ee4eb152d126cbce68c65410b8a030 to mainline-extservices-release

Change-Id: Iafe0e1ef108d5f877e93ad16ce35ef2cda5f1064