Merge changes from topic "fix-policy" am: e7194bfdfc am: e2e382b125 am: 577d6b2be5

Change-Id: Ibd6fe5d8220983b94fb4ce480f6d71da342cf21d