tree cbbe782da5f997c07d77ee277b1b58242f4b77c9
parent 5c3dc8f3d46e6946a045b950ede5c0ebcb15451a
author Scott Baker <smbaker@gmail.com> 1488346378 -0800
committer Scott Baker <smbaker@gmail.com> 1488346378 -0800

CORD-880 apply CORD-891 from base to new_base

Change-Id: I19853f87f325cf9f71f7ca3b756e0643178448ee