Snapshot 09118679ff7861de0fe2b742591e5d6aadba3fcc

Change-Id: I35cdb320673d847d8122bc03b9832d13673ea208
Snapshot 9fd57cbacd95e89602f430244c35bbc67f08b6d2

Change-Id: Ibc3a4bf4161d286c7cfab89a19c676eb5cc9224f
Merge remote-tracking branch 'google/jb-mr1.1-release' into jb2