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

Bug: 120502534
Change-Id: I457f7ae5ba1dd3e9eb0c7977876649d5a058265d