DO NOT MERGE

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

Bug: 120502534
Change-Id: Icdae506bd48cdd7fa97e9a8c6847729ef0e1ef34