(Merges master Change Ib38a019b + Change I50f55004) Change-Id: I2cbb63f0f20cdd2652b6b64ae0dee4343b952973