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