Merge "Fix return type of getModelYear" into qt-dev am: 7570c58381
am: 5a3fd860aa

Change-Id: I1a64caca7638bc6ebba312a8745d1365e7db3051