Merge "Fix typo in aosp/1242602" am: 1ae55164 am: c9d416f7 am: 938304cb am: ac805955 am: 17fc19fb Change-Id: I1d3c4a865e0173e5ae818a1c5f64ed839fda8978