[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: e6c4d0e4 -s ours am: 6264f68b -s ours Change-Id: I9a04c099cd7eb63c7039cd5ccf42440f58ff5f19