Pinned header optimizations and fixes

Change-Id: I4a53d55f18dc7b4e21518f8c4c653a7ecde8470e
3 files changed