[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master am: 39b4ed1183  -s ours
am: 86213fca47  -s ours

Change-Id: I19c57eefe9df2f9494d3db01fa2df59d234e1973