Merge remote-tracking branch 'remotes/goog/studio-feature-ij2016.3b' into studio-master-dev am: 8ff7068455 am: 4f69d4d8 am: c47d631a am: cc4e2666 Change-Id: I9bcc246a38e390ecb4302a356740315027526c8b