Merge "Revert "Skip tests 1923 and 1924 on ASAN 64""
am: d317442147

Change-Id: I9c488ab2d138c05acbd56456dc7d76ea958e11b7