Merge "Fix ODR issue in viewcompiler" am: b9879d00c4
am: d1e12a6112

Change-Id: If323e9e1a097055d359e1cba146f31449f640253