am 6bb8fa6f: am 4996f119: Merge "Use decltype() instead of typeof()"

* commit '6bb8fa6f103ac5b791661ab55a2aecc631f67b55':
  Use decltype() instead of typeof()