Merge "make croot slightly more useful" am: 9d868c0
am: 6bba816

* commit '6bba81654bc5561377b47181ac1d1b0b944a309a':
  make croot slightly more useful

Change-Id: I09d8a71f227ad7960884840dae18ebba3197062f