update 5.2.4

Change-Id: Iad3ec625c596ad81ab03aac6de7c00fb3de48948