Merge tag 'v3.0.1-javalite'
am: f4fe6ab672

Change-Id: Ia6204209550ecc61ae07e90d854bc07ba6ee2b0c