tree 6d00442429eab666af7af6d7030e0492d2e8dd6e
parent ac01ef36bbbcfe2ab61758324bd04f1fbc3edb68
author Charles Chan <rascov@gmail.com> 1546400165 -0800
committer Charles Chan <rascov@gmail.com> 1554020175 -0700

Address comments in gerrit 20327

Change-Id: Icadd58a401d32362a826b5ac33bdffec15ca8169