DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: I396269cd1cf8b17c82fbbf59241b3db3fc257cfa