[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 76201443 -s ours am: 56e9006e -s ours Change-Id: I36d151665d757ef5f7d97d3e1272c0c07b5385f8