DO NOT MERGE

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

Bug: 120502534
Change-Id: Ibc83e5626a662c089c454d13f73ffe2fdeddcd96