Update patch set 2

Patch Set 2:

Rebased and fixed merge conflict.

Patch-set: 2
Reviewer: Gerrit User 2245 <2245@4a232e18-c5a9-48ee-94c0-e04e7cca6543>
Label: Verified=0
This commit is contained in:
Gerrit User 2245 2018-01-17 01:31:26 +00:00 committed by Gerrit Code Review
parent 264c904186
commit 0a21cb2a26

Diff Content Not Available