am 5b56f7d6: Merge "Updated spinners Bug: 5076695, 5165156"

* commit '5b56f7d6f662a543d0432a46047a55f1ee900994':
  Updated spinners Bug: 5076695, 5165156