Change-Id: I725529a96b5ad4318e0e0a8c2bd61b84ae439a32 Refs: #1490
Change-Id: I3e548f974255f62a4680cfc6c12be3bb7a3db4d2 Refs: #1486