Merge to upstream r355142. am: cc3148bd34
am: 4041d10e89

Change-Id: I68203fc12df36bce7c4199a5986bfb72431b0a87