DO NOT MERGE

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

Bug: 120502534
Change-Id: Ib35fb8cfb88f42e1e65fdf31b384f85146932c61