DO NOT MERGE

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

Bug: 120502534
Change-Id: Iaf7b5c7432941df3cc3c3c766fd5c8be02485878