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

Change-Id: Ia9173eb1935814c1e2a1b62afb63b06adba39850