Stop additional conditional hook if MW < 1.37, and move the check to inside the hook itself Bug: T299305 Change-Id: Ied1c5c0beee015d7b0a8d6bd750346f4a8a5aaa1
Bug: T298856 Change-Id: I1e635785d0a29d87f510e729b11fce9a2eb68e11
Change-Id: I79aa319f177589d85446888289568748cd63d1c5