tree 327ba712821fe32a16e87480a7c4f6dcbc45e6a5
parent c32f084b70816b5e4f02396d606b1050e2860532
parent 9eb9687112e40ccc6195e35fe8102ede6c3d9c15
author Lloyd Pique <lpique@google.com> 1524856083 -0700
committer Lloyd Pique <lpique@google.com> 1524856396 -0700

resolve merge conflicts of 9eb9687112e40ccc6195e35fe8102ede6c3d9c15 to master

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If7fca8d20ccff5c64b1d32905b88665af12bbc2e