This reverts commit 46216d0e61. Reason for revert: Roll forward - Added ag/3351790 to the topic Change-Id: I64990e558d3f77165ab3fe89006a02225b712257
46216d0e61