reflect comments to patch 3

Change-Id: I4bfdacef85876685bfc4cbfec69f2f94ef48ebc5