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

Bug: 120502534
Change-Id: I19dd426a01dd39c162081306eb199870ff8065ab