ref: 489f8b2d882691bffd88cc4a54ccb4ea6d553bd0
parent: 146ccd304f146c3e5dccb35733b1ee49a446d5ce
parent: 4f0e4d6cef827bc452848e126a6bedc47424da88
author: Yaowu Xu <yaowu@google.com>
date: Wed May 18 19:54:55 EDT 2016
Merge "Prevent invalid read"