Changes in response to review comments

Change-Id: I92beef18971414c34bd79cfd0a120ce810e0ae37
Merge after collisions.

Change-Id: I860fd429d799206ff89a87b324e043ee948565a1