[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 72350b69cc  -s ours
am: 2e37889906  -s ours

Change-Id: If0176c428c7c2ccf80045da7cee9641bac360166