DESCRIPTION

fix recovery conf and add cli conf

Change-Id: If54ca4fe84ebfd12f7132ab2b48043130184007c


COMMENTS

author: Frederick Booker
date: 2017-01-17 22:29:25.564000000

Uploaded patch set 2.

-------------------------------------
author: Frederick Booker
date: 2017-01-17 22:30:01.396000000

Patch Set 2: Code-Review+2 Verified+1

-------------------------------------
author: Tate Garrett
date: 2017-01-17 22:30:03.073000000

Change has been successfully cherry-picked as 54d07b1a5cc53bbb95b9ac8c56fec0265dcaa154 by Frederick Booker

-------------------------------------
