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

Bug: 120502534
Change-Id: I674b89442ad4fb75081fb5b8fdbb8ea89be97c5c