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

Change-Id: I66d00b6913e1b2a7bffe6bbc5b1ef2261ce9f53f