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

Change-Id: Ibffb945b0db31ac1a2ff053595e82476cc8a3fa4