DO NOT MERGE

Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: I13167cf4bcf89b7eb90c656a7742de815b40e1aa