Add pyramid support

Change-Id: I66aca15337f670be9cf76df6a51f793b5a6fa23f
Merge "Add pyramid support" into kk4.4