Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev am: 91ca9f60e9
am: a674aa69c2
-s ours
Change-Id: I8c03e500a6d50eb9f7085d217a6ec0d92bbba873
This commit is contained in: