Merge version v3.19.4

Change-Id: I6ce3ee30ce179adf010a755a654d86c84a77b42d