Patch for last commit since this is open source library. issue: 2672163 Change-Id: I0517239ec87bc56911882baf24e5fe36b82ec998