Merge "Update incompatibilities.txt." am: bf50c047b9
am: 996f6ef12d

Change-Id: I17e984d4f10e709e081b4dd21a132970dfd3365b