Merge 2e35d279098577236301d3a99cf1bb6b2adca9d7 on remote branch

Change-Id: I77c1f5e91f7988089c874cecdde88e1f9b0391a1