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