Merge \"make round icon usage configurable\" into nyc-mr1-dev
am: 7b52b2eccd

Change-Id: I99706274705ca5589a70370af8dd17f5a4bc0297