DO NOT MERGE

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

Bug: 120502534
Change-Id: Ib1da4ec5270c8bfdb95994e1130e6c7d65eaeb87