Merge "Address comments from #725016"
am: 5ca3145db9

Change-Id: I1ac39d690ed6ee68e9909a7f2c4f06d2ffdcd0c9