Itchy submit finger, incorporate review comments. Change-Id: I7754ad825da32389510d1bfc967f542f0b1033ed