ref: 009116cb6f7a75645c7c3092f97a5fa4cd42d15b
parent: 113f9721d144a1a143a77036db97549b73c66fe9
parent: 6fc07a217da53554e56321ead7437cc67f627492
author: Paul Wilkins <paulwilkins@google.com>
date: Thu Sep 1 11:59:29 EDT 2016
Merge "Modified resize loop constraints."