Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev