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

Change-Id: I51e54f6e11287c98ff684616be91efcbfc7b2e1e