Merge back APEI material for v4.16.

This commit is contained in:
Rafael J. Wysocki 2017-12-21 01:54:44 +01:00
commit fd0861952d