Merge "app crash due to Invalid column count IllegalArgumentException"
am: 30b3ba89e4

Change-Id: I5034bbe91a2d79d487cb5e4012693131ac4aca4b