Merge conflicts

Change-Id: I7203c8c26c78bbe6c64d8d5f8e2124f97bd540de