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

Change-Id: I10ea8e8e1d93173da3f995f490b1fe9bcc7d90bc