push to 5.2

Change-Id: I21c298c85c99ba1ead286976befdc0e9e3807f96