Merge "correct value of TYPE_MAGNIFICATION_OVERLAY" am: 9e94328e22 am: ce9203d628 am: d396aa6869
am: 5885883145

Change-Id: I89569cf2f3602cba8bb73dfca9a02e99d49fa33b