Fails on nightly ubsan, valgrind tests. Enabled on commit:67010143 Change-Id: Ied3f5cb38e39cba54ac134f4514107cdfdfce159