Merge remote-tracking branch 'remotes/goog/studio-feature-ij2016.3b' into studio-master-dev am: 8ff7068455 am: 4f69d4d8 am: c47d631a Change-Id: I9994ccb6a01429b7490b44cca336ef4d1b6f48af
mentioned in commit f13bf802