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