Merge "Added check for vendor module to parse-and-fix-errors" am: a198d93cc6 am: 90dc3bdcce
am: 0d1a7fc4be

Change-Id: I387ef90aedb5320d7ff978efbc8e6c1f43ba7287