DO NOT MERGE

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

Bug: 120502534
Change-Id: I54128a9136ea50c6755e6a7b5865cd1785fd0f8c