DO NOT MERGE

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

Bug: 120502534
Change-Id: I481b9545abd60fc5686f0ee6f554e516a0bf8630