Manual merge

Change-Id: I81dd98ba150e936b675ff2323994a1e381512332