Closes #1076
Change-Id: Ia22b89c38b3b1ff7ead05f8484e15edef6218953
Change-Id: I59f9156ae0f13f04ba846806c661292f29339945