Sync list props behavior between Java and C++ am: db7daa1440 am: bf73f88ad9
am: 6e7e67e228

Change-Id: Ibabecd7a56523a1fee17bc8ca7700e73a29051cf