Snap for 4413317 from 4ff3dd7830f69c0305ba5248c2fa1f9f58092741 to pi-release

Change-Id: I43fe41a21be46dba7458dd5274c2379fcfeb416f