Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2e4 am: 65d65ec14b
am: a3460f2bb1

Change-Id: Iccb6dc6a7758abffe2d25bcc8b5dfbb1f600b05c