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

Bug: 132622481
Change-Id: I8a7729e39a378d381b324b74050b72c1244c9f4d