Merge "Fixed NullPointerException" into qt-dev am: d4b94862b7
am: 7303e026f0

Change-Id: I5dfb8678d2787337a7c65ddf92a214c546089de3
tree: 9a5b684d6250c1c23221ada8044e284cfd0372bf
  1. build/
  2. common/
  3. tools/
  4. OWNERS
  5. PREUPLOAD.cfg
  6. test_defs.sh