Merge to upstream r320528. am: 9ca0ad7a15 am: b92b9a89cb
am: 07a8c48f58

Change-Id: I8820bbd2f1f4d06929648b29caf5d5e407ce805e