ref: fe533c97413313a4e4c75ce1a1a6ec7451b5acc3
parent: f24b9b4f871344059015b5ff82fc10cc405ad504
parent: 92a29c157fb7a82cc32550fec82e90b33d3250ed
author: Yaowu Xu <yaowu@google.com>
date: Tue Sep 24 06:37:17 EDT 2013
Merge "Change to prevent invalid memory access"