DO NOT MERGE

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

Bug: 120502534
Change-Id: I9062eecd2fedfe049f40cafefc4ae927c24d6b3c