Change-Id: I65af858bc6d10197c6ee11111fa9f7c1faa617ef Refs: #2497
Change-Id: I9351c669282c3c02fd533237489beeb10fe7d15e Refs: #2497