duck the second commits
(cherry picked from commit 66c4efb6ec2b77aaaed93ccf7cc334a735b0af2c)

Change-Id: I895eb7d5cfa0ba8a9435edbc45318f6e029d283a