Merge "Address review comments from the previous change to this file." am: 1c41b9dd am: 5c44e1e0 am: 438224fa Change-Id: Ibef86388022e2d0518da308239e71f092945066e