Reconciles the following commits from aom/master to nextgenv2: - 25aaf40b - 87073de5 Change-Id: Ideda50a6ec75485cb4fa7437c69f4e58d6a2ca73