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