Merge remote-tracking branch 'foo/master' Conflicts: LICENSE Change-Id: I7069ba9c21bc6bc8fd11e1b84c6b1a82701ee407