DO NOT MERGE

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

Bug: 120502534
Change-Id: Ib96848e94e5cdf5d9c51a75eaf0d04e7f8bb3f69