Merge branch 'stable-2.16'

* stable-2.16:
  Check if approvals array is null before iterating

Change-Id: Iac4b5f078fcb176bfc5f2963c6edd46b09ca5dd4