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

Change-Id: I42c193c884d4278c11d2ec675c26230746795e5b