Merge "Update spacing and background color for condition/suggestion." into...
Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev am: 91ca9f60
am: a674aa69 -s ours
Change-Id: I8c03e500a6d50eb9f7085d217a6ec0d92bbba873