Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: Ic144cf594d29a6029bc509067c3868dc969d59f8