Snap for 5310204 from cb6b95e55cfafebd05a9923c7d051cd5516ffb6d to pi-platform-release

Change-Id: Ifc362cc95978f4750d7df3ac1459bfc064353b02