Snap for 4587185 from d384cc94fdf6ddebe0927eca1cb74fd0259af244 to pi-release

Change-Id: I0dc51ec939fae51332841e936a033d11d40270a5