DO NOT MERGE

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

Bug: 120502534
Change-Id: Ia1a5a6637fcf3ce0227716bd42836a9c3401130d