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

Bug: 120502534
Change-Id: I71a4b61a5a8655471ecafee9c263b120b8469ea6