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