aostapenko's update-info

Change-Id: I788f1315fa8aa7343001c68383305a895ccca44e
Merge "aostapenko's update-info"