Snap for 7110675 from 5e61866b794fcfeeb6504e42beffc316f1792fea to sdk-release

Change-Id: Iad7ca196580a933ef46c79b24535a27c5382909e