Merge pie-platform-release to master - DO NOT MERGE

Change-Id: I0048843acdbafe02f17077f411f5c4f7a47c236c