DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: I63bedf30fa0a4629cfab1dbe94359b4d36cf9ac1