Merge "Fixed invalid memory read, removed dead code"
authorSudarshan Prasad <sudarshan.prasad@intel.com>
Sat, 10 Jan 2015 01:43:38 +0000 (01:43 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Sat, 10 Jan 2015 01:43:38 +0000 (01:43 +0000)

Trivial merge