Merge "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 7d0eb60e -s ours am: c56f8c4e -s ours"