Some reorganization to accomodate up/down variances.
Fixed merge conflicts
Incorporated patchset 7 review comments
Signed-off-by: Rafael Jardim <rafaeljordao.jardim@windriver.com>
Change-Id: I7356e81526a94c0249526b44ce667f789245f6e2
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
96760528b1
