Merge changes I7faabafc,Id71244c5 into qt-dev
am: 024c11aa74

Change-Id: I130b83201d547c93109e2e8559baa06b3d5d53b8
tree: fe54105d57525fadd0a20d5df9af414cc29188ef
  1. nn/
  2. .clang-format
  3. CleanSpec.mk
  4. OWNERS
  5. PREUPLOAD.cfg