am 9cefcd7e: Merge "Performance improvement for mapping table creation."

* commit '9cefcd7e7b1fdfcd38c35aad36e1c0a0aabfa32c':
  Performance improvement for mapping table creation.