Merge pie-platform-release (PPRL.181105.017, history only) into master Bug: 118454372 Change-Id: I77c7ab8b44051e05994d8a1dcffca88a6a5eb3c1