DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

Bug: 120502534
Change-Id: Ib0e07dc0b571834e797a9f0b921658043671dd73