Squash reconciliation w/ garwynn... ytf not

Change-Id: Icc1c97cba0a806567f22ac1a07d5104cae43587c