Merge "Remove the reference to android.support.v7.widget.Space" into nyc-mr1-dev am: 3d60893532 am: c22a7117ea
am: cae9274dce

Change-Id: I3e8885633b315e28c3e55b8b5d71858781b680f3