Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796

Change-Id: If0646e3c2b9b9927a58811606fff28e432e6d303