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

Bug: 120502534
Change-Id: I11d008b8f4b846f39dcdd9257e9bd8829b89a462