Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: Iae482c6db84b081b4e637b7a51a0b27c8d59b02d