Merge "update script to tell users to use v 1.7 Bug:13021828 Change-Id: I5113e478738229fd6a0144e18a8c499e64fae3c2"