Merge "changes to support Change-Id: I572fdfd6d34dbb5a0577c6cf14664b6f2d5700b4"