Snap for 5013112 from 41f76a6311dada02120693206cb8e2e411f7ce29 to pi-b4s4-release

Change-Id: I82b9a50a7f39e1e7efa4bee30a7f3ca38aae3929