Broken due to a bogus merge conflict resolution. Change-Id: Id4e3215ac964ebac792e29f50741b020c06d11f4