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

Change-Id: I55de938d9e5f6b17e7f8dbbf99bab41fd5cecc72