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