am 5ca48347: am 67cb6d1c: Merge "Check allocation"

* commit '5ca4834740cb4eb3707eb7c557f42091fbabe006':
  Check allocation