DO NOT MERGE

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

Bug: 120502534
Change-Id: If3a2ea8a0ecf48102bb627643e55f7b962d1e070