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

Change-Id: Iae0cc89cea82009620a75ac03de86a72ea20f1bb