Merge "Merge to upstream r347903." am: fda9b09aa5
am: 6cf2bc2958

Change-Id: I162651ca831bdb9e9e8c3f7145e4ba621f1b58ec