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

* commit '9d868c0800eef398f8d02c13555aa85cf0f8357b':
  make croot slightly more useful

Change-Id: I04bb6e11ee9a0797ccdc180529c6ce7b0851ee1c