Merge "Increase test timeouts" am: d53208c8e7
am: a01f124db4

* commit 'a01f124db44f32fc6a9247c960ed158dc256280b':
  Increase test timeouts

Change-Id: Id6dcdafb262b7b42e222d41db927b5a32b3dc8d9