tree df2b9f7e21539da3a0f5dbd3a8eedcc18d7ee7f6
parent 037444ddaf6d36ef1ecf6172320c33afc7b46d6a
parent 64e19de569acd6af5f67f7420b4d1d83a17ea3cd
author Jason Monk <jmonk@google.com> 1504787188 -0400
committer Jason Monk <jmonk@google.com> 1504787188 -0400

resolve merge conflicts of 64e19de569ac to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I485e2fd5ef4e449223e1c095652ee5b596a8d77c