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

Bug: 122685541
Change-Id: Id4da16a074cf4c766dadea5d8accfb05ea2a8e97